Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Fri, 12 Oct 2012 09:45:45 +0000 (11:45 +0200)
committerEli Zaretskii <eliz@gnu.org>
Fri, 12 Oct 2012 09:45:45 +0000 (11:45 +0200)
commit9cf5fbc5b8f5e3480e85e0094f5978bc0eb3d7fb
treecd304a5ae99d5cf0c79d21571fb083090fcb5a29
parenta3dbfa2219bd347ed686714800762c0af0297e32
parent70f880d75d33845e5a41334b0f9f003dc977dd26
Merge from trunk.
lisp/ChangeLog
lisp/mail/rmail.el
src/ChangeLog
src/alloc.c
src/keyboard.c
src/lisp.h
src/makefile.w32-in